places sidebar: don't open a bookmark when clicking eject

Trying to open a bookmark which is being ejected is at best confusing.

https://bugzilla.gnome.org/show_bug.cgi?id=704087

diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 7e84cb42356f4d95c360765579351f661e38661c..1fadbf55689162a00fedd03590191139fbf5dcea 100644 (file)
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -3265,13 +3265,18 @@ bookmarks_row_activated_cb (GtkWidget *widget,
                            GtkPlacesSidebar *sidebar)
 {
        GtkTreeIter iter;
+       GtkTreePath *clicked_path = NULL;
        GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
 
        if (!gtk_tree_model_get_iter (model, &iter, path)) {
                return;
        }
 
-       open_selected_bookmark (sidebar, model, &iter, 0);
+       if (!clicked_eject_button (sidebar, &clicked_path)) {
+               open_selected_bookmark (sidebar, model, &iter, 0);
+       } else {
+               gtk_tree_path_free (clicked_path);
+       }
 }
 
 static gboolean